Move portable container machine maps to JSON config files (#6188) - #7512
Open
Akshat005Chaudhary wants to merge 1 commit into
Open
Move portable container machine maps to JSON config files (#6188)#7512Akshat005Chaudhary wants to merge 1 commit into
Akshat005Chaudhary wants to merge 1 commit into
Conversation
) Replace hardcoded imageUploadMap and imagePullMap Groovy maps in openjdk_tests with JSON config files under a new config folder: buildenv/jenkins/config/portable-container/ ├── README.md ├── criu/ │ ├── imageUploadMap.json │ └── imagePullMap.json └── scc/ ├── imageUploadMap.json └── imagePullMap.json The pipeline now auto-discovers feature types via findFiles(), so adding support for a new feature only requires adding the corresponding JSON files — no changes to openjdk_tests are needed. Follows the same node/checkout scm/readJSON pattern used in aqaTestPipeline.groovy. Related: automation/issues/294
karianna
approved these changes
Aug 30, 2026
karianna
left a comment
Contributor
There was a problem hiding this comment.
LGTM not sure if Dockerfiles for 26 now exist though
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Moves the hardcoded
imageUploadMapandimagePullMapGroovy maps out ofopenjdk_testsand into external JSON config files, completing the second phase of the Portable Container
Testing setup described in #6188.
Closes #6188
Related: automation/issues/294
Background
PR #6195 ("Set up pipeline for criu and portable SCC") added inline Groovy maps for both
CRIU and portable SCC directly into
openjdk_tests. During review, it was acknowledgedthat this mapping would eventually move to a separate config file to make the pipeline
extensible without requiring code changes.
This PR implements that config-folder approach.
Changes
New:
buildenv/jenkins/config/portable-container/Each
imageUploadMap.jsoncarries:commonLabelBase— base Jenkins node label for the featurebuildList—BUILD_LISTvalue for child jobstarget—TARGETvalue for upload child jobsexcludeTargetOnPlatform— platform-specific test exclusions (e.g. CRIU ppc64le backlog/1099)platforms— map of platform → list of label suffixesEach
imagePullMap.jsoncarries:commonLabelBaseplatformsModified:
buildenv/jenkins/openjdk_testsimageUploadMap/imagePullMapblocks with anode { checkout scm; readJSON(...) }config-loading block (same pattern asaqaTestPipeline.groovy).findFiles(glob: ".../portable-container/*/imageUploadMap.json")forauto-discovery — the pipeline detects supported features from the directory
structure at runtime.
generateJobViaAutoGen,parallel,build job:,changeParam) is unchanged.Net result: −104 / +63 lines in
openjdk_tests.How to Add a New Feature (after this PR)
aqa-tests/external/<feature>/buildenv/jenkins/config/portable-container/<feature>/imageUploadMap.jsonbuildenv/jenkins/config/portable-container/<feature>/imagePullMap.jsonNo changes to
openjdk_testsrequired.Testing
identical to the previous hardcoded maps for all platforms (CRIU: 15 upload
targetstring, ppc64le exclusion substring, and resulting target-after-exclusionall verified to match the original values exactly.